gtkaccellabel: Remove unused class members
authorJavier Jardón <jjardon@gnome.org>
Thu, 20 May 2010 00:39:45 +0000 (02:39 +0200)
committerJavier Jardón <jjardon@gnome.org>
Tue, 10 Aug 2010 02:17:29 +0000 (04:17 +0200)
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=97414

gtk/gtkaccellabel.c
gtk/gtkaccellabel.h

index 9193ea5bf1beaf75493fb8fc2e5abd2b89d262d2..716e8d7cd0a953f4c450ae0d790bdcc822202ef5 100644 (file)
@@ -180,9 +180,6 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
 
 #endif /* GDK_WINDOWING_QUARTZ */
 
-  class->accel_seperator = g_strdup (" / ");
-  class->latin1_to_char = TRUE;
-  
   g_object_class_install_property (gobject_class,
                                    PROP_ACCEL_CLOSURE,
                                    g_param_spec_boxed ("accel-closure",
@@ -802,8 +799,7 @@ _gtk_accel_label_class_get_accelerator_label (GtkAccelLabelClass *klass,
     g_string_append (gstring, klass->mod_separator);
   
   ch = gdk_keyval_to_unicode (accelerator_key);
-  if (ch && (g_unichar_isgraph (ch) || ch == ' ') &&
-      (ch < 0x80 || klass->latin1_to_char))
+  if (ch && ch < 0x80 && (g_unichar_isgraph (ch) || ch == ' '))
     {
       switch (ch)
        {
index 3ad0a37c7a33b5b4b7d86bf5110724131a33a8b7..872c588e4771ff9d753568aa898ec1d345db5358 100644 (file)
@@ -74,9 +74,7 @@ struct _GtkAccelLabelClass
   gchar                *mod_name_control;
   gchar                *mod_name_alt;
   gchar                *mod_separator;
-  gchar                *accel_seperator;
-  guint                 latin1_to_char : 1;
-  
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);